(ffap-machine-p): Always return nil if

open-network-stream is not fboundp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d38a8fbea495041e83be01e425f78453f9d38b5..faede76c8ad8a735d5a0e9720a860f66748f4240 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-17  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * ffap.el (ffap-machine-p): Always return nil if
+       open-network-stream is not fboundp.
+
 2001-06-17  Stefan Monnier  <monnier@cs.yale.edu>
 
        * textmodes/sgml-mode.el: Move `provide' to the end.  Update copyright.

diff --git a/lisp/ffap.el b/lisp/ffap.el
index 648688813d62901e2fc01212e7fa27ac93769f45..fcded84e40273fccd2c0fe99f60f830e4830af22 100644 (file)
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -396,6 +396,7 @@ Returned values:
       (cond
        ((eq strategy 'accept) 'accept)
        ((eq strategy 'reject) nil)
+       ((not (fboundp 'open-network-stream)) nil)
        ;; assume (eq strategy 'ping)
        (t
        (or quiet